container: Remove composite_name

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 85fc62b1d18835ae1f4f8dad8adde1e274b6809d..59fb3ad647fd14f19de929a9bec7f24556d4820c 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -328,9 +328,6 @@ static void     gtk_container_map                  (GtkWidget         *widget);
 static void     gtk_container_unmap                (GtkWidget         *widget);
 static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget   *widget);
 
-static gchar* gtk_container_child_default_composite_name (GtkContainer *container,
-                                                          GtkWidget    *child);
-
 static GtkWidgetPath * gtk_container_real_get_path_for_child (GtkContainer *container,
                                                               GtkWidget    *child);
 
@@ -476,7 +473,6 @@ gtk_container_class_init (GtkContainerClass *class)
   class->forall = NULL;
   class->set_focus_child = gtk_container_real_set_focus_child;
   class->child_type = NULL;
-  class->composite_name = gtk_container_child_default_composite_name;
   class->get_path_for_child = gtk_container_real_get_path_for_child;
 
   container_signals[ADD] =
@@ -2036,84 +2032,6 @@ gtk_container_get_children (GtkContainer *container)
   return g_list_reverse (children);
 }
 
-static void
-gtk_container_child_position_callback (GtkWidget *widget,
-                                       gpointer   client_data)
-{
-  struct {
-    GtkWidget *child;
-    guint i;
-    guint index;
-  } *data = client_data;
-
-  data->i++;
-  if (data->child == widget)
-    data->index = data->i;
-}
-
-static gchar*
-gtk_container_child_default_composite_name (GtkContainer *container,
-                                            GtkWidget    *child)
-{
-  struct {
-    GtkWidget *child;
-    guint i;
-    guint index;
-  } data;
-  gchar *name;
-
-  /* fallback implementation */
-  data.child = child;
-  data.i = 0;
-  data.index = 0;
-  gtk_container_forall (container,
-                        gtk_container_child_position_callback,
-                        &data);
-
-  name = g_strdup_printf ("%s-%u",
-                          g_type_name (G_TYPE_FROM_INSTANCE (child)),
-                          data.index);
-
-  return name;
-}
-
-gchar*
-_gtk_container_child_composite_name (GtkContainer *container,
-                                    GtkWidget    *child)
-{
-  gboolean composite_child;
-
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
-  g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
-  g_return_val_if_fail (_gtk_widget_get_parent (child) == GTK_WIDGET (container), NULL);
-
-  g_object_get (child, "composite-child", &composite_child, NULL);
-  if (composite_child)
-    {
-      static GQuark quark_composite_name = 0;
-      gchar *name;
-
-      if (!quark_composite_name)
-        quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
-
-      name = g_object_get_qdata (G_OBJECT (child), quark_composite_name);
-      if (!name)
-        {
-          GtkContainerClass *class;
-
-          class = GTK_CONTAINER_GET_CLASS (container);
-          if (class->composite_name)
-            name = class->composite_name (container, child);
-        }
-      else
-        name = g_strdup (name);
-
-      return name;
-    }
-
-  return NULL;
-}
-
 typedef struct {
   gboolean hexpand;
   gboolean vexpand;

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 37af1ea1985b8feeff758b8b0aadcdaa9f733eb3..6725a80e25c468900ed7e25964efe3d5013bb85d 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -63,7 +63,6 @@ struct _GtkContainer
  * @forall: Invokes callback on each child of container.
  * @set_focus_child: Sets the focused child of container.
  * @child_type: Returns the type of the children supported by the container.
- * @composite_name: Gets a widget’s composite name. Deprecated: 3.10.
  * @set_child_property: Set a property on a child of container.
  * @get_child_property: Get a property from a child of container.
  * @get_path_for_child: Get path representing entire widget hierarchy
@@ -89,8 +88,6 @@ struct _GtkContainerClass
   void    (*set_focus_child)   (GtkContainer    *container,
                                 GtkWidget       *child);
   GType   (*child_type)                (GtkContainer    *container);
-  gchar*  (*composite_name)    (GtkContainer    *container,
-                                GtkWidget       *child);
   void    (*set_child_property) (GtkContainer    *container,
                                 GtkWidget       *child,
                                 guint            property_id,